curl: update to 8.15.0

- Merge LIBCURL_NGTCP2 and LIBCURL_NGHTTP3 into single LIBCURL_HTTP3 config option
- Rename LIBCURL_NGHTTP2 to LIBCURL_HTTP2 config option
- Disable IPFS support which is enabled by default
- Refresh a patch

Signed-off-by: Aleksey Vasilenko <[email protected]>

diff --git a/net/curl/Config.in b/net/curl/Config.in
index e07c06291ca42a1d2fdf5cb40cddfb40bf1d7770..94f204440a601f538db95a18b7a4c001925db7ea 100644 (file)
--- a/net/curl/Config.in
+++ b/net/curl/Config.in
@@ -105,20 +105,15 @@ config LIBCURL_TFTP
        bool "TFTP protocol"
        default n
 
-config LIBCURL_NGHTTP2
-       bool "HTTP2 protocol"
+config LIBCURL_HTTP2
+       bool "HTTP/2 protocol"
        default y
 
-config LIBCURL_NGHTTP3
+config LIBCURL_HTTP3
        bool "HTTP/3 protocol"
        depends on LIBCURL_OPENSSL
        default n
 
-config LIBCURL_NGTCP2
-       bool "QUIC protocol"
-       depends on LIBCURL_OPENSSL
-       default n
-
 comment "Miscellaneous"
 
 config LIBCURL_PROXY
@@ -157,9 +152,9 @@ config LIBCURL_UNIX_SOCKETS
        help
                Enable HTTP over unix domain sockets.
                To use this with the curl command line, you specify the socket path to the new --unix-domain option.
-               This feature is actually not limited to HTTP, you can do all the TCP-based protocols 
-               except FTP over the unix domain socket, but it is only HTTP that is regularly used this way. 
-               The reason FTP isn't supported is of course its use of two connections 
+               This feature is actually not limited to HTTP, you can do all the TCP-based protocols
+               except FTP over the unix domain socket, but it is only HTTP that is regularly used this way.
+               The reason FTP isn't supported is of course its use of two connections
                which would be even weirder to do like this.
 
 config LIBCURL_LIBCURL_OPTION

diff --git a/net/curl/Makefile b/net/curl/Makefile
index 1bf9b6e5fba0f4096cc5abeef4b6e288f9d887ad..152c01b264d9e1cda19f660478d2128ef3cb6155 100644 (file)
--- a/net/curl/Makefile
+++ b/net/curl/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/nls.mk
 
 PKG_NAME:=curl
-PKG_VERSION:=8.12.1
-PKG_RELEASE:=2
+PKG_VERSION:=8.15.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/curl/curl/releases/download/curl-$(subst .,_,$(PKG_VERSION))/ \
        https://curl.se/download/
-PKG_HASH:=0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202
+PKG_HASH:=6cd0a8a5b126ddfda61c94dc2c3fc53481ba7a35461cf7c5ab66aa9d6775b609
 
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=COPYING
@@ -56,9 +56,8 @@ PKG_CONFIG_DEPENDS:= \
   CONFIG_LIBCURL_SMTP \
   CONFIG_LIBCURL_TELNET \
   CONFIG_LIBCURL_TFTP \
-  CONFIG_LIBCURL_NGHTTP2 \
-  CONFIG_LIBCURL_NGHTTP3 \
-  CONFIG_LIBCURL_NGTCP2 \
+  CONFIG_LIBCURL_HTTP2 \
+  CONFIG_LIBCURL_HTTP3 \
   \
   CONFIG_LIBCURL_COOKIES \
   CONFIG_LIBCURL_CRYPTO_AUTH \
@@ -97,7 +96,7 @@ define Package/libcurl
   CATEGORY:=Libraries
   DEPENDS:= +LIBCURL_WOLFSSL:libwolfssl +LIBCURL_OPENSSL:libopenssl +LIBCURL_GNUTLS:libgnutls +LIBCURL_MBEDTLS:libmbedtls
   DEPENDS += +LIBCURL_ZLIB:zlib +LIBCURL_ZSTD:libzstd +LIBCURL_THREADED_RESOLVER:libpthread +LIBCURL_LDAP:libopenldap
-  DEPENDS += +LIBCURL_LIBIDN2:libidn2 +LIBCURL_SSH2:libssh2 +LIBCURL_NGHTTP2:libnghttp2 +LIBCURL_NGHTTP3:libnghttp3 +LIBCURL_NGTCP2:libngtcp2 +ca-bundle
+  DEPENDS += +LIBCURL_LIBIDN2:libidn2 +LIBCURL_SSH2:libssh2 +LIBCURL_HTTP2:libnghttp2 +LIBCURL_HTTP3:libnghttp3 +LIBCURL_HTTP3:libngtcp2 +ca-bundle
   TITLE:=A client-side URL transfer library
   MENU:=1
   ABI_VERSION:=4
@@ -114,10 +113,11 @@ TARGET_LDFLAGS += -Wl,--gc-sections
 CONFIGURE_ARGS += \
        --disable-debug \
        --disable-docs \
+       --disable-manual \
        --disable-ares \
+       --disable-ipfs \
        --enable-shared \
        --enable-static \
-       --disable-manual \
        --without-nss \
        --without-librtmp \
        --without-ca-path \
@@ -137,9 +137,8 @@ CONFIGURE_ARGS += \
        $(if $(CONFIG_LIBCURL_SSH2),--with-libssh2="$(STAGING_DIR)/usr",--without-libssh2) \
        $(if $(CONFIG_LIBCURL_ZLIB),--with-zlib="$(STAGING_DIR)/usr",--without-zlib) \
        $(if $(CONFIG_LIBCURL_ZSTD),--with-zstd="$(STAGING_DIR)/usr",--without-zstd) \
-       $(if $(CONFIG_LIBCURL_NGHTTP2),--with-nghttp2="$(STAGING_DIR)/usr",--without-nghttp2) \
-       $(if $(CONFIG_LIBCURL_NGHTTP3),--with-nghttp3="$(STAGING_DIR)/usr",--without-nghttp3) \
-       $(if $(CONFIG_LIBCURL_NGTCP2),--with-ngtcp2="$(STAGING_DIR)/usr",--without-ngtcp2) \
+       $(if $(CONFIG_LIBCURL_HTTP2),--with-nghttp2="$(STAGING_DIR)/usr",--without-nghttp2) \
+       $(if $(CONFIG_LIBCURL_HTTP3),--with-nghttp3="$(STAGING_DIR)/usr" --with-ngtcp2="$(STAGING_DIR)/usr",--without-nghttp3 --without-ngtcp2) \
        \
        $(call autoconf_bool,CONFIG_LIBCURL_DICT,dict) \
        $(call autoconf_bool,CONFIG_LIBCURL_FILE,file) \

diff --git a/net/curl/patches/200-no_docs_tests.patch b/net/curl/patches/200-no_docs_tests.patch
index 326e0335e8e07b8aa50c7460313492f4fb6dceee..d57ee6310d7ef5bfe271bac67c08f815b05b19e2 100644 (file)
--- a/net/curl/patches/200-no_docs_tests.patch
+++ b/net/curl/patches/200-no_docs_tests.patch
@@ -1,6 +1,6 @@
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -92,7 +92,7 @@ DISTCLEANFILES = buildinfo.txt
+@@ -88,7 +88,7 @@ DISTCLEANFILES = buildinfo.txt
  bin_SCRIPTS = curl-config
  
  SUBDIRS = lib docs src scripts
@@ -9,7 +9,7 @@
  
  pkgconfigdir = $(libdir)/pkgconfig
  pkgconfig_DATA = libcurl.pc
-@@ -188,12 +188,9 @@ rpm:
+@@ -184,12 +184,9 @@ rpm:
  if BUILD_DOCS
  install-data-hook:
        (cd include && $(MAKE) install)